Removed commented-out-code