Cleanup code!

Change-Id: I57f1c75d332b81338faeefd4eb9492b8daa41937