dependency updates, code cleanup