cleaned up some useless code