shouldn't these lines be removed now?