DEBUG - Remove useless things and try again