Removed old files, added format detection