Remove Api._setup and style tweaks