remove unused source, and add return