get rid of un-needed security workaround