cleaning up uneeded code