Removed UI thread debugging
Cleaned up and refactored