Removing deprecated syntax