Getting rid of some out-dated functions.