Remove unnecessary semi-colons
Fix broken logic in cleanup