Remove unused variable; fix source analysis