clean up old comments and combine common setting