Minor changes
Dependencies removed