Removed unused code and renamed activities