Removing references of Architect