Removed some necessary libs + a little bit refactoring