Issue 4

* Removed some unused define structures