removed commented functions