Replacing code that makes no sense....