Eliminated useless files from main