Removing unused empty view, commenting some more confusing code blocks