Cleanup some doubtful customs