removed commented-out code for generic views