Removed unnessesary stuff in main