Removed unecessary and outdated comments