Added preRemove multipart callback
Syntax cleanup