removed implementations from .h, removed unuseg includes