commented, misc cleanup