Removing excess interfaces classes until we find a concrete use for them