removed unnecessary statics