- cleaning code to remove warnings
- remove old folter