Some comments removed