remove malfunctioning conditional loading