Got rid of unused function