Consolidate + trim down NEAT library