fix & remove unused stuff