eco pretty much done
removed junk