Remove non-used stuff