final push, removed legacy code