Fixed "over" clean up :)