removed vars etc