Removed class members that bacame static/global