Design optimization and cleanup