Created by: Timer
This removes some workarounds which really aren't needed anymore. Should speed up tests a bit. 😄