Remove old require, remove file test