Cleaned up - removed not needed commented code.