Removed commented out code, we won't be using it