Removed obsolete subroutines