Attempt to clean up - fail miserably