Remove legacy methods