Removed some useless stuff from Main