Remove old Calendar class