Final bug fixes and delete user update