Remove commented code and update header.