Make the AdminBundle optional
Refactor dead code