properly removed stuff