rearranged server core
specs cleanup after themselves