(cleanup) clean up the unused code in spot folder