Adding back some cleanup code