Unnecessary comments removed