Fix recursive import
Remove unused import, add more logging
Fix recursive import
Fix app module importing