Merged a useless file, other various things