removed unused commented-out code
moved file_sys to common