Removed unnecessary assemblies