Removed unnessesary code and includes