Removed non required subsystems