this is probably the better solve as it removes many "claude-isms"