Clean useless comments
Update step appropriately