Remove deprecated interfaces