Make it clean

Remove unnassessary code