Remove all not needed stuff, possible clean up later, readd