Removed some obselete code
Merge branch 'wheel'