Removed unneeded extension and tests