Cutting out more code