Removing unused code and files

[tristntran]

These are currently unused. You can re-introduce them if you want to add complexity.