Removed some stuff we do not need