tidying up un-needed controls