removes old code, updates tests for new format