Remove debugging artifacts.
Try to refactor some more. Not working.