Remove more optional package related left-overs