removed no needed stuff