Remove author comment, added overrides