Removed signals dependency