Simplify, remove obsolete step