remove debugs and try to improve performance