Remove if statement from calcium