removed some pointless stuff from main