Removed list conflict in folder.clj, added remove-message