I need to cleanup this commented code.