Removed superfluous components and tests