Need to cleanup this commented out code