Implementing some cleanup