please don't leave things commented out, if we need them later we can just pull them out of version control. having all kinds of legacy stuff commented out in the code gets dirty fast.