CLEANED-UP: removed commented code from older version