Removed all mixed in C usage. Cleaned up includes. General cleanup