removed commented out code which is no longer needed