Removed missed dependencies between AIM and SIM