still some junk to remove...