Getting rid of scafold