Removed out-of-date commenting