Cleaned up some header files
Removed unused test targets and files