Updated and removed some sutff

Hopefully it won't bug anymore.