Cleaning up some artifacts