Clean up weird comments; Fixed ObjectId caller