Cleanup code: no placeholders, clean library use