Removing stale old api code. Fixing some doc strings