removed some of the uneeded code