Removed commented-out code that are not needed