Update some API code
remove server directory for cleanup