Removing Dharamani's code