Removed left-over code