Cleanup and Nexus skeleton