Delete the commented out code, makes this really confusing -- in general please rm the commented out code throughout this file.