Removed stuf and tests