Remove no longer used methods