Cleanup of useless headers
Fixing build system for options library
Polsihing up Options