Removed a lot of uneeded imports/listeners that no longer are needed