Cleanup

No more dirty fix.