Remove some unused code from collection