removed uneed function calls