Remove shit
patching up shit