Removed boilerplate code still in the project