Clean up design