Remove disabled stuff from config
Fix indentation