comment out unneeded stuff and i don't like crafty
merge conflict fix