removed special cases that don't apply