Micro fixes, removed unnecessary lines.