Cleaning and updating

removing clutter
adding dependencies