more code cleanup -- commented a few more files, removed two depricated