Cleaning up entity form