Cleanup workarounds for fixed issues

Hooray for cleaner code! These workarounds no longer need to be used anymore.