Remove the commented-out bit unless it's actually needed for something?