Remove extra files, annotate models