Further clean-up
Further clean-up

e-koch/frontend,camelot-project/frontend,adamginsburg/frontend,camelot-project/frontend,keflavich/frontend,adamginsburg/frontend,camelot-project/frontend,scog1234/frontend,adamginsburg/frontend,keflavich/frontend,keflavich/frontend,e-koch/frontend,scog1234/frontend,scog1234/frontend,e-koch/frontend