cleaning old code + fix