Remove schedulers and some additional stuff