Cleaned up imports and removed logs