Cleaned up the Structure classes.

Removed some unused algorithms