removed commented out code as it was no longer needed