removed dependencies
improvements