some cleanup...