Cleanup

- cleanup and bootstrap /account/*