Added removal of draft