Remove unnecessary functions
Implement APIs