Description tweaked and removed old code