Make following work and comment unused code