Finished cleanup that was on the todo list