Removed clutter code and comments, plus fixed the remove feature so that it works for any band different from AE :)