Removed unneeded interfaces and updated types