Some changes
Removed unused file