Remove unneded files and lines