Minor cleanup to remove commented out methoud and move the exsisting method into the correct location