Added file deletion code, cleaned 'using' area