- removed some unneeded stuff