Removed log and fixed some dependencies