Taking out more code