Some cleanup done