removed some uneeded stuff