Removed some old code and moved the last listeners