Deleted commented code, changes in select helper.