removing unused code :scissors: