Deleted obsolete function, altered comments