Added MiscListener, Removed old stuff