Imported vendor libraries
Removed hacks