Cleanedup warnings. Removed MainClass