Removing static keyword from definitions