Cleaned kernel stuff