Clean up, update dependencies