Removed bluetooth includes
Improved stuff