Cleanup and fix decrypt activity