remove unneeded and broken conditional