Removed dependencies for issue #1