Cleaned up a lot of code, but broke it.