Remove a lot of jank