Removed a lot of Solidarity-specific code