Removed unneeded stuff and added collector and collectable.
Removed unneeded stuff and added collector and collectable.