Cleanup unused codes

Issue: N/A