first start at removing stuff