[BUGFIX] Extension Manager Cleanup