Removed unused methods and files
Merge branch 'headunit' into development