cleanup logic from design