Code cleanup -  removed un-referenced files & commented-out code