Fix warnings
Remove static declaration