Delete a few magic numbers