some cleanup work