Remove comments and other fixes