remove some unused constants
add properties for more functions