up to date with mimosa
cleaning up files