Removed calcz, more #if 0's

Only indent from calcz was being used, so I moved it to math