remove public, static from classes