Remove some unnecessary steps (for default install)