Major cleaning

Change-Id: I04c0d02db7ed670be324580c048d86b08d774301