cleanup code cleanup