Cleaned up some stuff....

Change-Id: Ie0ab1c757345399cca2959fc73ce06c51ed098ed