MB: clean up controller