Optim: Remove some unused files