Disable by default and remove leftovers

Signed-off-by: flar2 <asegaert@gmail.com>