Cleaning things up for F-Droid