Removed old stuff.

Change-Id: I3288d657c41dae3fe239378ee50216d0fcda6433
Added new content.