Several pieces of cleanup