Removed unused references and set version