Cleaning up unused warnings