kernel cleanup part. 1