Removed unnecessary patches, imports and commented lines
Fixed patches to patch in the right place