removed a lot of not necessary stuff #4