Could this commented out code be cleaned up? :)