Revert "Started working on structure specific options"

This reverts commit 6b2d238d5220c0f04528f263bbc1b2d21f0c4d61.