Remove junkies & make it simpler
..