Clean up, removed all traces of current path and ghost implementations for redesign