Removed Algorithm dependencies