replaced System.out with log() in economyHandler class
added onCleanup() to handler classes