Clean up integrated, add more info on custom