cleanup

some cleanup work