removed unused code from cash
Merge branch 'dev' of 192.168.0.139:git into dev