clean up and database layer removal, opting for standalone api