* Code clean-up (removed excess commented out code/files)