Clean up and update dependencies