Removed Dynamic Delay (too buggy) and unused code