Ammending 220393 - Removing unused functions.