Some updates
Removing garbage