Removed unrelated and old stuff.