Remove unused interfaces
Clean up field access