Removing disabled views

Change-Id: Icb8cbbb08935685d80a516282775223da6c4ef5a