Cleaned up some stuff re recent re-architecture