remove not needed stuff,
rename function