Removed "calc" statements