cleanup and include customisation stuff in role