Schema cleanup
api lock down