Remove unused directives
Remove unused vars