Fixed unused functions