Removed some unused functions. Bit of code cleanup.