Temporarily removed some rarely used functions that are causing some type problems in other applications