removed more unused features