Singleton
Merge branch 'options-page' into develop
Clean up

Remove unused functions and correct typo