Remove kernel dependency