Removed two functions that were not generic enough