Commented out broken systems due to removed code in order to restore successful build status.