Getting rid of SSOBundle close #274