Just a few comment updates and a very minor code removal