Updating and cleaning up...