Updated with removal of files