Cleaned up unnecessary references on interface generator