remove server fields and calendar macro