Cleaned up quite a bit of stuff...

Change-Id: I0255f0c0ea3f83784b93927f8190d79b35dad69d