Custom settings + clean up