cleaned up

removed unused code and references.