Removed the loops for not displaying options.  This has been decided by the clients.