remove hard-coded additions of interfaces, use Interfaces class