Removing the old modular stuffs since it's the real deal now