removed useless unbinds and fixed type