Removed some unused code, whitespace fixes, setup.py corrected

Change-Id: I7daa343bd318335e889beb4d11e5da8e07dafdf7
4 files changed