Remove cheesecake dependency