Pre cleanup
Added remove file option