Removed left over code