Rename & remove unused gem