Cleaned up some stuff...

Change-Id: Id4aa73b612046f5a8aad6e1781b6e59e9de956a5