Remove explicit internal references
Remove static keyword from non-static property