cleanup
still not 100% but getting closer.