Minor comment tweaks + unused imports
Removed unused methods
Moved base64Encode to Util class
Removed deprecated test & fixed lint warnings