Removed more comments