remove singleton, clean file a bit