Cleaned up kernel

Change-Id: If39aa7f8a0595de08b3b6725fc222845b985863e