Remove calc() usage