Removed unneeded interfaces