VP-152 Removed useless dependecy, removed test code