Cleaned up old code from before Reactor refactor