REFACTOR: clean up mechanism