Fixed issues with left over info