Code base clean up

- Cleaned up non tests projects code base.