Removed unused Imports, removed object access to static classes