Cleaning up some missed code