Merge
Removed commented out polling