Removed the most obvious trash ; put directives into own files