Remove unnecessary class and module option