Revert "Added Time-Over Callback and bugfixes"

This reverts commit 0e403e76c25c7f7e1cbef0692cd23fc40974d441.