clean chipmunk stuff;
Merge branch 'cleanChikmunk' into allInOne