Clean up commented code - remove redundant object