Removed wrong comments and superfluous code