Code review fixes
Removed accidentally commited duplicate cereal headers