removed excess features thing