Still removing extra code from other branch.