Removed unnecessary catalog querys.