r1430 + trac#85 --- got rid of the following functions: