All non-template neither inline methods moved from .h to .cc