Removed excessive logging and imports

Change-Id: I3daa1b51e1a4c728d8dad459303ce3a90c83cb06
Merge "Removed excessive logging and imports"