mark - removed commented code