Took out the two broken functions

See branch