modifing users control to remove following code as it is now in query