Deleted some extra classes and fixed launcher issues