Removed functions that were removed with previous commit; I hate merges