Started remove stuff, default to no edit, updated usage