Entity comment cleanup round 1

Fight!