Remove unnessesary boiledplate