Clean up imports
Clean up warnings