Clean up screenshot removal logic