Cleaned up un-used code.