- removed some unneeded code