Cleanup/library split