AE Clean up

PR mainly for the AE clean up. 

Contact me for doing remote pulls without opening a PR on yourself.