Clean unused attributes and classes
Merge pull request #2 from jrybla/cleanWarnings

Clean unused attributes and classes