Removed some stuff...