Some cleanup..