removed unnecessary classes and encryption of gcm task, also fixed small bugs