* Fixes clean rules
* Remove keywords patch (was include in upstream)