cleaned up apis