more code trimming