Apex: Remove snapshot workarounds