Work on version check + remove useless