remove cards + some refactoring