Removed the overarchitected stuff