Cleanup of Sportsclub Spring 4.0 variant dependencies