Feature suppress tax info and refactoring

Was denkt ihr?