Clean up after some brainstorming