cleaned up some stuff

Change-Id: I11ad4ac679b28678caa219a825f775e4ff25f250