Did not need the extra annotations (and it caused problems on one dev
env).
Not currently generating tokens for the HomePlace