cleanup after merge
unnecessary remove
fixed resolve for functions added via 'include'