Removed some uneeded stuff