Removed no needed logic