cleaned code
removed unused files

Change-Id: I2b264803b5fb6b2cb8bc0c0c842dbef83a2d2af5