Cleaning up some ugly stuff we had to do before...