removed console specific logic