Clean up

Cleaning up unused API files as well as fixing naming