Removed rarely used functions and cleaned up more.
Replaced with functional list functions.