remove a lot of unused stuff and made the code cleaner