fix and cleanup disabling stuff in helpers.h