Fixing some validation errors
Some enhancements
Deleted unnecessary files