Code Cleanup

Some unneccesary code cleaned up.

Change-Id: Iebc43ddc8276d5865c640b7fa955152a3361eb36