Remove unnecessary mkdir.
General cleanup.