cleanup code, ready to start main filesystem support