removed debug code, _needs_ to be refactored