[sr-dev] source code clean up