Removed unneeded interfaces and corrected names and code.