Removing some left over code