Account Management and REST
Account Management and REST: cleanup