Remove unused data structures
Clean up build system