Removed old stuff and updated DSK