solving minor issues
remove unholy dependency