Bits of cleanup
cleanInstance removed parameter