Middle part update and cleanup