removed some unneeded stuff