Cleanup
Fix for BT Remote