removes some cruft and adds this contract to newOnly functions, fixes one of the cases for regular functions