More api code clean up updates