removed remnants of the old architecture