V.0.4.7
- cleanup to get rid of warnings