Clean up : removing unnecessary comments and functions