a bit of cleanup was needed