Removed unrequired subsystems