removed property related functions and unncessary static variable