Cleanup, but doesn't fix bug :(