MAJOR CLEANUP

Change-Id: Ie6760d6b86fdf92bbcaebf6e08439d0f9158e885