Clean up

- started going through to remove deprecated code
- removed binaries that aren't being used at this time