Remove unnecessary interfaces, fixes #2