cleanup and back to basics. reduce to testing