cleaned up working commit and removed unused code