Small changes
Removed unused Assignments