Cleans up warnings for unused imports, deprecated static import