removed useless functionality