Updated to new file ops
Code cleanup