Cleaned up some log lines
Cleaning up unused UDCs now