working now
remove junk