Clean-up and dependency updates.