Removed check for server and internet check where not needed