@mindblender 
Is this commented out code needed? If so please add a clarifying comment, if not please remove.