remove cleanup code