Clean up a bit of strange code