Currency Cleaning

* Cleaning some Currency Scheduler code

TODO: This still needs a lot of attention