Cleaned things up. Offline support removed