Cleanup, update dependencies