Remove offending functions with hopes of implementing the functionality in C