removed possibly offending logic