More static import and general cleanup