Using existing data when no connection is available
Removed useless class