Cleanup & dependencies update