Clean up annotations in extract.clj