Clean up core server and update documentation