Cardaction - Removed all pet stuff

Removed all pet stuff and cleaned up some code.