cleanup
remove Angular DI cruft, as this won't ever be minimised
reorg / tweaks