Removed smart comments