removed unnessesary code and nav controllers