Removed no longer used functions