Improved fitting window import; revert addition of staticmethod's in fit service