Update Filesystem.php

Small PHPDocs fixes and removed the return statement in the cleanDirectory method (not supposed to return anything)
fix conflicts.