Removed some hard-coded parameters