Remove unneeded
Architecture improvement